From da618e9258e2cd2bf99a8b431751ee1317e671e3 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Mon, 21 Nov 2005 15:06:49 +0100 Subject: [PATCH] Mute error message on SMP resume if a secondary CPU is already back online. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/xen/kernel/reboot.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c index c77cd2eadf..311003e32c 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c @@ -189,17 +189,16 @@ static int __do_suspend(void *ignore) #endif /* - ** Only resume xenbus /after/ we've prepared our VCPUs; otherwise - ** the VCPU hotplug callback can race with our vcpu_prepare - */ + * Only resume xenbus /after/ we've prepared our VCPUs; otherwise + * the VCPU hotplug callback can race with our vcpu_prepare + */ xenbus_resume(); - #ifdef CONFIG_SMP out_reenable_cpus: for_each_cpu_mask(i, prev_online_cpus) { j = cpu_up(i); - if (j != 0) { + if ((j != 0) && !cpu_online(i)) { printk(KERN_CRIT "Failed to bring cpu " "%d back up (%d).\n", i, j); -- 2.30.2